Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Black Goo Patch #3633

Closed

Conversation

realforest2001
Copy link
Member

@realforest2001 realforest2001 commented Jun 14, 2023

About the pull request

Patches Black Goo so there's no more random/accidental infections.

Explain why it's good for the game

APPARENTLY we're randomly having zombies pop up

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
admin: Added a flag that determines if zombies can spread or not. Unauthorised spread will create a big admin message.
/:cl:

@github-actions github-actions bot added the Feature Feature coder badge label Jun 14, 2023
@realforest2001 realforest2001 added Logging Make the admins more miserable Testmerge Candidate we'll test this while you're asleep and the server has 10 players Admin Make things harder for admins and removed Feature Feature coder badge labels Jun 14, 2023
@@ -7,6 +7,10 @@

// This proc has some procs that should be extracted from it. I believe we can develop some helper procs from it - Rockdtben
/mob/proc/contract_disease(datum/disease/virus, skip_this = 0, force_species_check=1, spread_type = -5)
if(istype(virus, /datum/disease/black_goo) && (SSticker.mode && !MODE_HAS_TOGGLEABLE_FLAG(MODE_ALLOW_ZOMBIES)))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Forest seriously I swear.... OOP exists for a reason. At least do it 2018 style and define a handler proc on the disease, don't strap istypes based chunks in the middle of stuff like it's 2012

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if(virus.can_infect(src))

or something i don't know

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But where's the fun in that. If I did everything perfectly first time around you wouldn't have so much fun reviewing it! :HAH:

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mean 😭

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do this when/if I have time tomorrow

@github-actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jun 26, 2023
@github-actions github-actions bot closed this Jul 4, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Feb 13, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Feb 13, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@realforest2001 realforest2001 removed the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Feb 13, 2024
@realforest2001 realforest2001 added the Test Merge Only This PR's purpose is for testmerges only. label Feb 13, 2024
cm13-github added a commit that referenced this pull request Feb 13, 2024
@realforest2001 realforest2001 added Stale Exempt PR can't go stale and removed Stale beg a maintainer to review your PR labels Feb 13, 2024
cm13-github added a commit that referenced this pull request Feb 13, 2024
@Crimsonerva Crimsonerva mentioned this pull request Feb 13, 2024
3 tasks
@FighterOfKeyboard FighterOfKeyboard mentioned this pull request Feb 13, 2024
3 tasks
cm13-github added a commit that referenced this pull request Feb 14, 2024
cm13-github added a commit that referenced this pull request Feb 14, 2024
cm13-github added a commit that referenced this pull request Feb 14, 2024
cm13-github added a commit that referenced this pull request Feb 14, 2024
cm13-github added a commit that referenced this pull request Feb 14, 2024
cm13-github added a commit that referenced this pull request Feb 15, 2024
cm13-github added a commit that referenced this pull request Feb 15, 2024
cm13-github added a commit that referenced this pull request Feb 15, 2024
@GamerRed13 GamerRed13 mentioned this pull request Feb 16, 2024
3 tasks
cm13-github added a commit that referenced this pull request Feb 18, 2024
cm13-github added a commit that referenced this pull request Feb 18, 2024
cm13-github added a commit that referenced this pull request Feb 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Admin Make things harder for admins Logging Make the admins more miserable Stale Exempt PR can't go stale Test Merge Only This PR's purpose is for testmerges only.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants